[ML] Reuse SourceDestValidator for data frame analytics #50841
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This commit removes validation logic of source and dest indices for data frame analytics and replaces it with using the common `SourceDestValidator` class which is already used by transforms. This way the validations and their messages become consistent while we reduce code. This means that where these validations fail the error messages will be slightly different for data frame analytics.
|
Pinging @elastic/ml-core (:ml) |
| @@ -46,7 +46,6 @@ | |||
|
|
|||
| // messages | |||
| public static final String SOURCE_INDEX_MISSING = "Source index [{0}] does not exist"; | |||
| public static final String SOURCE_LOWERCASE = "Source index [{0}] must be lowercase"; | |||
There was a problem hiding this comment.
This was unused.
hendrikmuhs
approved these changes
Jan 10, 2020
| @@ -427,13 +417,13 @@ public void validate(Context context, ActionListener<Context> listener) { | |||
| return; | |||
| } | |||
|
|
|||
| if (context.resolvedSource.contains(destIndex)) { | |||
| if (context.resolveSource().contains(destIndex)) { | |||
| // ), | ||
| // true, | ||
| // null | ||
| // ); |
There was a problem hiding this comment.
^ needs re-activation or should be removed
There was a problem hiding this comment.
Reactivated it. Good catch.
| @@ -464,21 +478,11 @@ public void testCheck_GivenDestIndexIsAliasThatMatchesMultipleIndices() throws I | |||
| CLUSTER_STATE, | |||
| new String[] { SOURCE_1 }, | |||
| DEST_ALIAS, | |||
| SourceDestValidator.NON_DEFERABLE_VALIDATIONS, | |||
| Collections.emptyList(), | |||
There was a problem hiding this comment.
not getting this change, should the test be removed?
There was a problem hiding this comment.
These second assertions in those tests seem to be testing that when the validation is not present then the error does not occur. Previously the NON_DEFERABLE_VALIDATIONS set was passed around but I could not see what the difference was compared to passing an empty list. Does this make sense?
dimitris-athanasiou
deleted the
reuse-source-dest-validator-for-df-analytics
branch
dimitris-athanasiou
added a commit
to dimitris-athanasiou/elasticsearch
that referenced
this pull request
Jan 10, 2020
…#50841) This commit removes validation logic of source and dest indices for data frame analytics and replaces it with using the common `SourceDestValidator` class which is already used by transforms. This way the validations and their messages become consistent while we reduce code. This means that where these validations fail the error messages will be slightly different for data frame analytics. Backport of elastic#50841
dimitris-athanasiou
added a commit
that referenced
this pull request
Jan 10, 2020
…#50850) This commit removes validation logic of source and dest indices for data frame analytics and replaces it with using the common `SourceDestValidator` class which is already used by transforms. This way the validations and their messages become consistent while we reduce code. This means that where these validations fail the error messages will be slightly different for data frame analytics. Backport of #50841
SivagurunathanV
pushed a commit
to SivagurunathanV/elasticsearch
that referenced
this pull request
Jan 23, 2020
This commit removes validation logic of source and dest indices for data frame analytics and replaces it with using the common `SourceDestValidator` class which is already used by transforms. This way the validations and their messages become consistent while we reduce code. This means that where these validations fail the error messages will be slightly different for data frame analytics.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This commit removes validation logic of source and dest indices
for data frame analytics and replaces it with using the common
SourceDestValidatorclass which is already used by transforms.This way the validations and their messages become consistent
while we reduce code.
This means that where these validations fail the error messages
will be slightly different for data frame analytics.